From ee00066a04c3b7ce1b1f1354182dc92b2f47594a Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Thu, 4 Nov 2004 21:31:02 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.377 (418a9f96-BWiFbfNWF-wv3xJaHdEMw) Redo the build tree if it wasn't created completely. --- buildconfigs/mk.linux-2.4-xen0 | 5 +++-- buildconfigs/mk.linux-2.4-xenU | 4 ++-- buildconfigs/mk.linux-2.6-xen0 | 4 ++-- buildconfigs/mk.linux-2.6-xenU | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index aded0d43b2..03ca303afb 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -12,7 +12,7 @@ include buildconfigs/Rules.mk .PHONY: build clean delete # The real action starts here! -build: $(LINUX_DIR) +build: $(LINUX_DIR)/include/linux/autoconf.h $(MAKE) -C $(LINUX_DIR) ARCH=xen modules $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install @@ -21,7 +21,8 @@ patches/ebtables.diff: mkdir -p patches wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@ -$(LINUX_DIR): pristine-linux-$(LINUX_VER) patches/ebtables.diff +$(LINUX_DIR)/include/linux/autoconf.h: patches/ebtables.diff +$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) rm -rf $(LINUX_DIR) cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR) # Apply arch-xen patches diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index e4d071e846..b7d5da4325 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -12,12 +12,12 @@ include buildconfigs/Rules.mk .PHONY: build clean delete # The real action starts here! -build: $(LINUX_DIR) +build: $(LINUX_DIR)/include/linux/autoconf.h $(MAKE) -C $(LINUX_DIR) ARCH=xen modules $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install -$(LINUX_DIR): pristine-linux-$(LINUX_VER) +$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) rm -rf $(LINUX_DIR) cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR) # Apply arch-xen patches diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index a2a8551ad7..7e1020941e 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -11,13 +11,13 @@ include buildconfigs/Rules.mk .PHONY: build clean delete -build: $(LINUX_DIR) +build: $(LINUX_DIR)/include/linux/autoconf.h $(MAKE) -C $(LINUX_DIR) ARCH=xen modules $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install # The real action starts here! -$(LINUX_DIR): pristine-linux-$(LINUX_VER) +$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) rm -rf $(LINUX_DIR) cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR) # Apply arch-xen patches diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index 70841551b5..2b96fc4467 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -12,13 +12,13 @@ include buildconfigs/Rules.mk .PHONY: build clean delete # The real action starts here! -build: $(LINUX_DIR) +build: $(LINUX_DIR)/include/linux/autoconf.h $(MAKE) -C $(LINUX_DIR) ARCH=xen modules $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install -$(LINUX_DIR): pristine-linux-$(LINUX_VER) +$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER) rm -rf $(LINUX_DIR) cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR) # Apply arch-xen patches -- 2.30.2